From 0f83f8437a108591957b56d77dc86a995180aad1 Mon Sep 17 00:00:00 2001 From: tsteven4 Date: Mon, 4 Jun 2018 23:46:26 -0600 Subject: [PATCH] catch mkstyle.sh up with nullptr. --- internal_styles.cc | 2 +- mkstyle.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal_styles.cc b/internal_styles.cc index f879944cc..b046e0e20 100644 --- a/internal_styles.cc +++ b/internal_styles.cc @@ -1492,6 +1492,6 @@ static char xmapwpt[] = style_vecs_t style_list[] = {{ "xmapwpt", xmapwpt } , { "xmap2006", xmap2006 } , { "xmap", xmap } , { "tomtom_itn_places", tomtom_itn_places } , { "tomtom_itn", tomtom_itn } , { "tomtom_asc", tomtom_asc } , { "tabsep", tabsep } , { "saplus", saplus } , { "s_and_t", s_and_t } , { "ricoh", ricoh } , { "openoffice", openoffice } , { "nima", nima } , { "navigonwpt", navigonwpt } , { "mxf", mxf } , { "motoactv", motoactv } , { "mapconverter", mapconverter } , { "mainnav", mainnav } , { "land_air_sea", land_air_sea } , { "kompass_wp", kompass_wp } , { "kompass_tk", kompass_tk } , { "igoprimo_poi", igoprimo_poi } , { "igo2008_poi", igo2008_poi } , { "iblue757", iblue757 } , { "iblue747", iblue747 } , { "gpsman", gpsman } , { "gpsdrivetrack", gpsdrivetrack } , { "gpsdrive", gpsdrive } , { "geonet", geonet } , { "garmin_poi", garmin_poi } , { "garmin_g1000", garmin_g1000 } , { "garmin301", garmin301 } , { "fugawi", fugawi } , { "flysight", flysight } , { "dna", dna } , { "custom", custom } , { "cup", cup } , { "csv", csv } , { "cambridge", cambridge } , { "arc", arc } , {nullptr,nullptr}}; size_t nstyles = 39; #else /* CSVFMTS_ENABLED */ -style_vecs_t style_list[] = {{0,0}}; +style_vecs_t style_list[] = {{nullptr,nullptr}}; size_t nstyles = 0; #endif /* CSVFMTS_ENABLED */ diff --git a/mkstyle.sh b/mkstyle.sh index cfd1a86a3..69138be86 100755 --- a/mkstyle.sh +++ b/mkstyle.sh @@ -38,10 +38,10 @@ do echo " ;" nstyles=`expr $nstyles + 1`; done -echo "style_vecs_t style_list[] = {$ALIST {0,0}};" +echo "style_vecs_t style_list[] = {$ALIST {nullptr,nullptr}};" echo "size_t nstyles = $nstyles;" echo "#else /* CSVFMTS_ENABLED */" -echo "style_vecs_t style_list[] = {{0,0}};" +echo "style_vecs_t style_list[] = {{nullptr,nullptr}};" echo "size_t nstyles = 0;" echo "#endif /* CSVFMTS_ENABLED */" -- 2.30.2